From 72794532a4c9365f0875797e905fe6f95813dc22 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 2 Mar 2008 14:25:44 -0800 Subject: [PATCH] Fix the switch-to-buffer-other-frame function so that it returns the new buffer. --- debian/changelog | 7 +++- .../fix-switch-to-buffer-other-frame.diff | 40 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-switch-to-buffer-other-frame.diff diff --git a/debian/changelog b/debian/changelog index 209c604da62..9b31c55e9c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,12 @@ emacs22 (22.1+1-3) unstable; urgency=low * Fix a problem with auto save file names. Thanks to Sven Joachim . (closes: #469017) - -- Rob Browning Sun, 02 Mar 2008 12:44:58 -0800 + * Fix the switch-to-buffer-other-frame function so that it returns the + new buffer. This also means that find-file-read-only-other-frame will + now correctly mark the new buffer as read only. Thanks to Sven + Joachim . (closes: #457539) + + -- Rob Browning Sun, 02 Mar 2008 14:22:35 -0800 emacs22 (22.1+1-2) unstable; urgency=low diff --git a/debian/patches/fix-switch-to-buffer-other-frame.diff b/debian/patches/fix-switch-to-buffer-other-frame.diff new file mode 100644 index 00000000000..9ac76c996f1 --- /dev/null +++ b/debian/patches/fix-switch-to-buffer-other-frame.diff @@ -0,0 +1,40 @@ +* The switch-to-buffer-other-frame function now returns the new buffer. + Patch: fix-switch-to-buffer-other-frame.diff + Provided-by: Sven Joachim + Date: Sun, 23 Dec 2007 17:44:08 +0100 + Added-by: Rob Browning + Status: merged upstream + + This also means that find-file-read-only-other-frame will now + correctly mark the new buffer as read only. + + Upstream changelog entry: + + 2007-12-23 Andreas Schwab + + * files.el (switch-to-buffer-other-frame): Return the buffer + switched to. + +Index: sid/lisp/files.el +=================================================================== +--- sid.orig/lisp/files.el ++++ sid/lisp/files.el +@@ -1006,14 +1006,16 @@ + "Switch to buffer BUFFER in another frame. + Optional second arg NORECORD non-nil means + do not put this buffer at the front of the list of recently selected ones. ++This function returns the buffer it switched to. + + This uses the function `display-buffer' as a subroutine; see its + documentation for additional customization information." + (interactive "BSwitch to buffer in other frame: ") + (let ((pop-up-frames t) + same-window-buffer-names same-window-regexps) +- (pop-to-buffer buffer t norecord) +- (raise-frame (window-frame (selected-window))))) ++ (prog1 ++ (pop-to-buffer buffer t norecord) ++ (raise-frame (window-frame (selected-window)))))) + + (defun display-buffer-other-frame (buffer) + "Switch to buffer BUFFER in another frame. diff --git a/debian/patches/series b/debian/patches/series index 76cf134e4b6..b64f9ed0421 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,4 +14,5 @@ version-mention-debian.diff support-gnu-kfreebsd.diff fix-format-overflow-cve-2007-6109.diff fix-auto-save-file-name.diff +fix-switch-to-buffer-other-frame.diff autofiles.diff -- 2.30.2